From 27be16e320fac3b64bb579102f065fbf7ee22b1f Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Mon, 7 Nov 2005 12:35:06 +0100 Subject: [PATCH] Hack around problem whereby VMX domains (using the ioemu device) now fail because the new hotplug script error checking kicks in. ioemu really ought to move out of blkif.py. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/DevController.py | 2 ++ tools/python/xen/xend/server/blkif.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py index 83363f9281..eed63ebbf9 100644 --- a/tools/python/xen/xend/server/DevController.py +++ b/tools/python/xen/xend/server/DevController.py @@ -57,6 +57,8 @@ class DevController: @return The ID for the newly created device. """ (devid, back, front) = self.getDeviceDetails(config) + if devid is None: + return 0 self.writeDetails(config, devid, back, front) diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index d60607f0f4..b3b1247e6c 100644 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -43,7 +43,7 @@ class BlkifController(DevController): dev = sxp.child_value(config, 'dev') if re.match('^ioemu:', dev): - return (0,{},{}) + return (None,{},{}) devid = blkif.blkdev_name_to_number(dev) -- 2.30.2